From: Colin Walters <walters@verbum.org>
Date: Wed, 23 Mar 2011 21:20:11 +0000 (-0400)
Subject: main: Allow replacement of org.gnome.Shell name
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8502
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=090d54516e6a9cc4531fc48ebdadcfa66aee55c3;p=gnome-shell.git

main: Allow replacement of org.gnome.Shell name

This was an oversight in the previous commit; if we don't
do this, then we just can't --replace.

https://bugzilla.gnome.org/show_bug.cgi?id=645593
---

diff --git a/src/main.c b/src/main.c
index eddb4c68c..589b27f1a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -52,7 +52,7 @@ shell_dbus_init (gboolean replace)
                                    DBUS_PATH_DBUS,
                                    DBUS_INTERFACE_DBUS);
 
-  request_name_flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;
+  request_name_flags = DBUS_NAME_FLAG_DO_NOT_QUEUE | DBUS_NAME_FLAG_ALLOW_REPLACEMENT;
   if (replace)
     request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
   if (!dbus_g_proxy_call (bus, "RequestName", &error,